Resolve CVS conflicts

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index e23788785ba141cb7f0987c701f13866f2d66df0..18fcb62d6bf9c6c88c5a46cdb5b852db50364d3e 100644 (file)
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -600,4 +600,5 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
 
 (provide 'x-dnd)
 
+;;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621
 ;;; x-dnd.el ends here